settings: Avoid a segfault when loading keyfile
authorBenjamin Otte <otte@redhat.com>
Wed, 2 Mar 2011 15:21:44 +0000 (16:21 +0100)
committerBenjamin Otte <otte@redhat.com>
Wed, 2 Mar 2011 15:21:44 +0000 (16:21 +0100)
When the keyfile is loaded, no screen exists yet, so we need to vheck
for that.

gtk/gtksettings.c

index 44fe5c68ca3e20e4ab8d66505902ab2881aac4c8..e2544066b0adb5363155012ba3ea71baeb5b35e9 100644 (file)
@@ -2671,7 +2671,7 @@ settings_update_color_scheme (GtkSettings *settings)
                               data, (GDestroyNotify) color_scheme_data_free);
 
       g_value_init (&value, G_TYPE_STRING);
-      if (gdk_screen_get_setting (priv->screen, "gtk-color-scheme", &value))
+      if (priv->screen && gdk_screen_get_setting (priv->screen, "gtk-color-scheme", &value))
         {
           merge_color_scheme (settings, &value, GTK_SETTINGS_SOURCE_XSETTING);
           g_value_unset (&value);